Fix order of ChangeLog entries after merge.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2125f7c1f8da8f875d7ddbea02f4b3ed7107d7d9..95f1599b6cbfa7a476ac16084425eed65744ed3d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,3 @@
-2011-05-27  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-       * xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup.
-
 2011-05-27  Paul Eggert  <eggert@cs.ucla.edu>
 
        Integer overflow fixes.
@@ -84,6 +80,10 @@
        a character than a buffer op, so better that it's in character.c.
        * fns.c, print.c: Adjust to above changes.
 
+2011-05-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup.
+
 2011-05-27  Paul Eggert  <eggert@cs.ucla.edu>
 
        * xselect.c: Fix minor problems prompted by GCC 4.6.0 warnings.